*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d843e3195000eddee3bd275f685f8f9ed3a66413..96b699315402bf3dbb3976ae02062829a63d9580 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-10  Juanma Barranquero  <lekktu@gmail.com>
+
+       * ediff-init.el (ediff-autostore-merges):
+       * textmodes/fill.el (fill-region): Doc fix.
+
 2007-01-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * server.el (server-ensure-safe-dir): UIDs may be floats.